Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 05:43:02 +0000 (22:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 05:43:02 +0000 (22:43 -0700)

Trivial merge